merge with xen-unstable.hg

author awilliam@xenbuild.aw <awilliam@xenbuild.aw>

Wed, 28 Jun 2006 13:52:21 +0000 (07:52 -0600)

committer awilliam@xenbuild.aw <awilliam@xenbuild.aw>

Wed, 28 Jun 2006 13:52:21 +0000 (07:52 -0600)
author awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 28 Jun 2006 13:52:21 +0000 (07:52 -0600)
committer awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 28 Jun 2006 13:52:21 +0000 (07:52 -0600)
diff --cc tools/libxc/xc_ia64_stubs.c
Simple merge
diff --cc tools/libxc/xc_linux_build.c
Simple merge
author	awilliam@xenbuild.aw <awilliam@xenbuild.aw>
	Wed, 28 Jun 2006 13:52:21 +0000 (07:52 -0600)
committer	awilliam@xenbuild.aw <awilliam@xenbuild.aw>
	Wed, 28 Jun 2006 13:52:21 +0000 (07:52 -0600)
		1	2
tools/libxc/xc_ia64_stubs.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/libxc/xc_linux_build.c	patch \|	diff1 \|	diff2 \|	blob \| history